Possible fix for #78