Fix class removing