Fixed nasty bug on discovering scenarios