Possible fix for #103