Fix value selection