Fixed combo values being repeated when no explicit value is provided