changes / int32 fix