bringing inline with change introduced in 0.67.0