Fix decompose