C. Jansen - fixed persistence issue!