Fixed #2439.
Backend SHA: a94a82072d293ae2e082a2463bda2219c1124c84