Fixed missing refactor of Flight Mode detection