Fixing Issue #389