Merge pull request #1492 from headshog/fix-ht-dec