further fix to #156 refactoring of EntityManagementUtils