KAZOO-1718: Fix code