#350 find after submit