[work item 138] fixed