PROBCORE-586 Fixing ExecuteUntilCommand