Fixing tab completion