Fix for PIG-3393