possible fix for #130