fix class cancel and check