Issue #388