Cancel action seems to be working correctly now.