fixed class persistence