adapted to upstream changes