#1153 Fix for save event