fixing an issue with broadcastOnFind