Fix: reorder lines problem