Implementation of Issue #282