#79 Fixed the suspend/resume/cancel glitching