adapted to 6.1.x