Fixed leaks with delay