Decomposition Fix
Merge pull request #484 from sandal-smuggler/Decomposition-Fix-1.02

Decomposition Fix