Added small hack for exact match