fix for ivc and more strict re for exclude