findOrAdd row fix