flight is dead solution commit anyway