Implementation of Issue #23