fixed Issue #14