UUID fix