Implementation of Issue #109