Fixed #2595.
Backend SHA: ed3b0c09d2cedb663c3eb8bab0775bea3783c496