Fixed multi-run bug