Fix for multiline problem and for int32 limit