Correction based on FindBugs Report