adapted for 2.0

latest commit e259d34898
@Atntias authored