PR for issue #86