Fixing after running Scrutinizer part 2