Potential OOM fix