Fixed bug from scrutinizer