Fix class implementation