Fixed design & FindBugs approved