fix Issue #11