Changed the order between then and else.
Make stepping by MIR instruction possible.