migrate to 1.8