Add little fix to check matches