#389 find after submit