prepare for 3.5