KAZOO-1513 KAZOO-2318 now working