One more fix for scrutinizer issue