attempt to fix scrutinizer issues