fixed  Issue #3