Fixing Issue #390