Fix #257: use model find