Fix build
Merge pull request #343 from xschildw/SWC-610-sclient-2

Fix build