Bugfix: Don't overwrite earlier matches