Quick fix for OOM exception