Fix for bug with server preprocessing