enhancement due to findbugs report