Possible fix for #99