fix Issue #245