Implemented the wait in the zauto (before the close) and fixed the blocking next.