Fix leaky view