Possible fix for #161