Fixed invalid entity mapping