fix cancel feature