Fix for an Issue #399