FIX SERVER BUG