Prepare for 1.60