a better Also memory fix