Corrected exit issue