addapted to 1.6