next fix for 3.0