FIX FOR NEW SERVER