Bugfix to Entity hydration.