Kazoo 1631

addresses the timeout issue reported by Noah