fixed scrutinizer bugs