Fixed quit feature