SC-53 - Should finally fix the cancelling problem