Fix #2533052. Fix #2533053.