Flight entity fix