Persistence patch in.
If there is an issue with DB persistance, this will take the place.