Addressed scrutinizer issue