Fix findbugs finding: comparing Longs by reference