UDC fix for real this time