Fix for 17.0 compilation