Fix #9628 even more