#392 find after submit