Fixed SWC-180 issue.