modifications based on FindBugs report