Fix issue with U1 crashing