Should fix leaks