Fixing up scrutinizer - Part 2