Addresses work item #416