Fixed automatic exiting