Fixed 'NO MATCH' bug