Should fix UUID problems, I hope .-.