fix Issue #16