Overflow fix