multiple fixes + uuid try