Fixed option to enable exiting