Decomposition Fixes
Merge pull request #547 from sandal-smuggler/Decomposition-Fix-106

Decomposition Fixes