Possible fix for issue #88