fix Issue #14