Implementation of Issue #86