fixed Issue #52