Fix Server Bug