#236 find after submit