fix the second problem hlk mentioned in issue