fix for Int/UInt