fix wait step bug, join steps