Fixing Issue #398