fix for 17.0.5