Flight Travel Form

Due to fact, that for druids and their travel form one mount buff is for groung and flying mount the bot does not recognized, when he is in ground mount mode. So if leaving a combat, the combat debuff often still exist a couple of seconds after combat. Result: Bot is in ground mount, wants to fly (because of flying gatherer profile) and stucks, dies, gets reported or whatever. Is there any way to fix this issue?