Fixes issues with landing not terminating