Fix issue 4308