fixing server bug