Implementation of Issue #245