Implementation of Issue #42