#246 find after submit