KAZOO-850 - corrected bugs