KAZOO-2545-+-KAZOO-2546
for the sake of consistency