#312 find after submit