Fix crash on redefine class...?