more liberal occurrence matching
this was broken and W.E.T.