SWC-579 and fix the build