Possible fix for #42