#4137 more ignoring and fixing