Fixed token propagation for new entries