Fix entity load