Probable fix for #348