Rewrite cancel method as it is posing some issues