@pkoro, this is only a performance tweak. The memory problem is here: a53e32bb5f3661c91c81ed817ad2d4eaaea6a9cf