[MAT-468] attempted fix of int/uint