Slight modification so that it can possibly work with old Errbit server