fix OOM exception in c95e80d2