Bugfix match several occurences