Possible fix for #92