#249 Scrutinizer fix