Fixing Entity->getId()