BROKEN COMMIT Started to fix the "memory leak"