re #9601 Done Correct KiKf