Fixing Decimal generation