Let's fix FlyAway (again!)