Closes #4999 This a bit "hackish", a proper fix for both flight masters (Ebon Hold and Shadow Vault) should be found
Merlin2010