Fix COV-54032