Fix entity server