fixed cancel and back