Adjust for 1.3.x