Implementation of Issue #278