Expand handle missing bug fix.
Merge pull request #2246 from flukeout/tabfix

Expand handle missing bug fix - fixes #2128