adapt wait to fork
v0.2b10