fixed latest oom bugs hopefully