issue #19456: fixed findOrCreate bug
Merge pull request #150 from shackbarth/19290

issue #19456: fixed findOrCreate bug