Chan leaks

Fix for #22