Change again where the freeing happens