Fixed: Back or cancel would not cancel.