broker data path fix