Fix for Store::save()