Fixed errors while creating new scenario