BUG: Changed order of decompositions.