#261 find after submit