Fixing U8 and U10