Fix in uc 6