fix on save-and-continue