Fixing Issue #387