Potential fix for issue #86