SWC-342: from code review