Auto-indent in PDSOE is bad on ELSE IF statements

The Auto-Indent in PDSOE seems to be particularly annoying with chained ELSE IF blocks.  Is there anyway to stop this happening? (while still being able to use auto-indent)

Auto indent is really useful for me to help tidy up old legacy code before working on it. The current behaviour makes this less attractive.

e.g. The following code:

DEFINE VARIABLE l  AS LOGICAL NO-UNDO.
DEFINE VARIABLE l2 AS LOGICAL NO-UNDO.
DEFINE VARIABLE l3 AS LOGICAL NO-UNDO.

IF l THEN
DO:
    RUN test1.p.
    RUN test2.p.
END.
ELSE IF l2 THEN
DO:
    RUN test3.p.
    RUN test4.p.
END.
ELSE IF l3 THEN
    RUN test5.p.
ELSE
    RUN test6.p.

... will become ...

DEFINE VARIABLE l  AS LOGICAL NO-UNDO.
DEFINE VARIABLE l2 AS LOGICAL NO-UNDO.
DEFINE VARIABLE l3 AS LOGICAL NO-UNDO.

IF l THEN
DO:
    RUN test1.p.
    RUN test2.p.
END.
ELSE IF l2 THEN
    DO:
        RUN test3.p.
        RUN test4.p.
    END.
    ELSE IF l3 THEN
            RUN test5.p.
        ELSE
            RUN test6.p.