- Fix out of memory issues
