Fixing server bug