#385 find after submit