Fixed to pass Findbugs