IM-1333: Fixes 'Numeric value out or range: 1690 BIGINT'
Merge pull request #457 from m038/IM-1333

IM-1333: Fixes 'Numeric value out or range: 1690 BIGINT'