Proper fix for UDID