Fixed #2411.

Backend SHA:4580385b9e8149785c35e8533d430a091df8976e