Possible fix for #86