issue #19550: Fix calculation that got mixed up/lost before.
issue #19550: Rename file
Merge pull request #43 from jrogelstad/19550

issue #19550: Fixes.
Merge pull request #9 from xtuple/master

catching up