Runtime execution major bug fix