Exiting fix