s4: int32 handling: previous fix was not fully correct