Merge "Fixed cancel() not working correctly"