Applied patch from Scrutinizer