Fix #5758