Fix sample broadcasting