fix scenario chaining