Fix free, no more memory leaks should occur