Critical bugfix - tmp vars not pushed on stack properly