Out of Memory error since upgrading from 3.3 to 3.4