Fixed #1615 Executes `afterSave` after real saved

See #1615