fix on waiting for z