Issue #14 fixed Findbugs error