Decompose, fix postfix corrupting next line of code