Issue #399