Adjusted for 1.7.