fix Issue #294