fixing error on i and syncing with upstream