fix issue-109/6