KAZOO-1770: Fix code