#348 find after submit