Fixed save_and_continue