Possible fix for #89