fix Issue #124