Make find returns consistent with find_one returns