388 UHL possible fix (early testing)