Add temp fix for 1.6 UUIDs