Implementation of Issue #103