Overflow fix attempt