Tweaked Tab handler, fixed #3