Fixed small bug with save and continue