try to fix scrutinizer bugs