fix Issue #305