For issue #82: Slow tab switching

For issue #82: Slow tab switching