fixed Issue #27