fix Issue #12