Fixing server side shit