changes regarding issue #86