fixed issue with save and continue function