Decomposition Fix