Fixing tab-completion