Fixed build for decompose