Oops, bugfix for the OOM bugfix