Bugfix: better missing match detection