Fixed some matching (especially dicerolling in the middle of a string)