TBD-677: subtask TBD-987 Try to fix some bugs of pig .
TBD-677: subtask TBD-987 fix a bug of pig .