changes for 1.8