broke something
perf fix and leaky var