Fix handling of EntityValues