fixed server bug