Quit trigger bug fix