possible fix for #131