Creds to Anders for memory fix