fix for 3.0.0 GA