I fixed findBugs reported bugs