Integer overflow fix
Pivot