FIX SERVER BUG-3