Fixing Issue #453