Implementation of Issue #101