Handle non-tmux more properly