changes for 3.7