Fix: memory leak due to last commit