Fixed FindBugs