A fix wrt. recent changes.