Fixing misterious cancel bugs