Bug fix involving reverting to last location after cancelling