Re-number to fix order