fix for issue #86