#259 find after submit