Tab completion bug fix