Potential fix for #377