Possible fix for #9