This should fix the bug with Tab Completion