SWC-1644: quick fix