Fixed OverflowException issues