Reverting to tolerance fix