Fix class & scrutinizer