Fix memory bug, temporarily