Fix leaky scenario