Fixes yet another OoM-handling corner case