Revision to fix cancel management