Issue #1 Fixed Findbugs warnings