[ticket/15] Fix scrutinizer issue