KAZOO-1539: improve preformance