Fix ticket #4367