FIX SERVER BUG-2