Bip110 supporters are working on it. The bitcoin that we are using up until now is broken for sure
There is no fix that includes trust though. Im sure intentions are good.