Handle mode output a little differently. Hopefully fixes a duplication glitch…