issue #19456: fixed findOrCreate bug