Fix for tab completion