Fixed OverflowError