DP-317  Add workaround for PIG-3315