Check if array when find_one called
Merge branch 'beta'