Fix for tab completions