Fixing Issue #18