fix after merge with upstream