More findbugs fix