Tab completion bugfix