Fix i-- when remove client