Fix to Issue #9 (Part 3)