Possible fix for #8