Fixed kazoo-2536.
Merge pull request #369 from jxiewei/KAZOO-2536

Fixed kazoo-2536.