SWC-701 Fixed bug that returns null