Fixes Issue #4 (Part 1/2)