Fix for direct use of save method (not used in UI)