Updated previous overflow fix.