Fixing Issue #398.