Porting to 3.2 version