fix flight and form