Fix: Return unmodified cup code when 8 digits or less