Fixed bug.
Fixed SWC-167.
Merge branch 'SWC-169'