Fix issue 3422