Scrutinizer Fix