adapt for 2.3 changes