Fixing server side bug