Module leaks fixed
leaks