Overflow fix :)