Cope with class desynchronisation (Alexandre)