postfix fix, var swap fix