Update #9 for FindBugs