#248 find after submit