adapt for 2.2.0dev