Fix scrutinizer issue #318, #319