Hopefully fix onQuit