Fix with upstream changes