changes for 2.7 backward-compatibility