Make sure c is large enough if there is an overflow
Consolidate muliptlication into one place
Merge pull request #2248 from carsonmcdonald/mulfix

Another change to fix issue #2244