Fix with new scenario refresh