Fixing scrutinizer code