Taking a crack and fixing a cancellation bug