addresses issue #86