fixing leaks...