issue #41: Cancel Button Bug