adapted to 1.1 change