fix for 'create/update'