new fix for BWP-832