Hazmat fix for UE