Issue #326