fixes for callback disabling and reenabling when saving issue