fixed upstream changes