Bug fixing for run