Fix #5435