Adding fix for BRMSGW issue