Entity tp fix. Maybe.