Fix an occasional scenario failure