Update in #1541.