potential fix for #347