New version fixing numbers in routing keys