Try to avoid OOM #3