Fix for https://issues.apache.org/jira/browse/PIG-3163