fix entity and service (not checked)