Fix for UUID