fix cancel