Fix issue #416 - mode selection is at the wrong position.