fix issue-109/8