Fixed servo number problems