fix Issue #267