Fix for quit action for all types of quits