KAZOO-2721: maintain consistency