Fix for nil cancelBlock