Try to make scrutinizer happy (Take 2)