fix issue-109/12