Reduce leakiness