fixing tab order, issue #206