Fixed #2326.
Backend SHA: 4fba12c893367824b352e8e59b7fd62a5b7031ba