Fixing Issue #15