Yes, please make this happen. A wrong click shouldn't mean you're out $18.