#277 find after submit