fix Issue #18