Fixed the fix for  BRMRSPA-13122