Fixed scrutinizer related issue