Quick and disrty solution to get fault finding % to 100% on second pass