Fix for JuliaLang/julia@4889924dd98650142052194798baa300e7430884