Fix for bulk save