921222: Fixed tab completion