Fixed Int32 regression