KAZOO-2787: Last fix for pull request