Save and continue not working correctly