attempts for porting to 3.3.2