fixes wait-stop
v0.2b6