Fixing Issue #399