fixed Issue #15