Combo should retain the original value if possible