bug-fix for issue #82