Fix for delegates with specified UUID