Possible fix for #105