Fixing Issue #431