Restoclass fix