fix issue-109/4