Fixed Quit (again)