[Fixes #126] Check for both pane-base-index and base-index.