Changing impl. of cancel