fix never ending scenario