KAZOO-1539: fix the broken