Fix the huge memory leak ...