Implementation of Issue #105