Fix for JuliaLang/julia#8790