Stop saving things in memory twice. Version 3.4.2 release