Possible fix for #96.