Fix - Now the cancel event is correctly handled.