Impove uuid match.