Fix class instance