Potential solution for #4474.