Probable fix for #134