Fully fixed entity persisitence bug

...hopefully.
It was still around but only appeared if you used the "Main Menu” button.