Possible fix for #95