Fix for issue #86