Put the Uuid check in the correct place for measurements