Fixing memory leak (Christian)