Fixed Issue #4 (Part 2/2)