Possible fix for #98.