Fixed decomposed bug