This solution to this issue is extremely simple, but I bet it will never be implemented in Bitcoin BTC. That's one of the reasons why it forked in 1 August 2017.