Fingers crossed this fixes entity resolution