fixes scrutinizer suggestions