Fixed error that prevent multiple runs