Fixing Issue #5.