Fixed single run bug