Fixed certain classes