Dev kaibosh 1489

Fix for issue #1489. Tested with tmux complete sequential. Needs testing with non-sequential.