Fix #2533116