Addressing Issue #23.