Fix problems with decomposing.