Overflow fix probably complete