changes for 1.35