adapted to 1.1.5 API