Addressing Issue #209