BUGFIX: Replaced all instances of currrent_flock with current_flight