Porting to 1.7