Better QUIT behavior?