Possible fix for #65