Prepare for 3.6