Porting to 2.11