potential fix for #128