Addressing Issue #787