Fix lazy initialization issue reported by FindBugs