Fix to persistence classes