fix issue-109