Fixing server preprocessing