first work for 1.7 update