another change related to WorkItem 170