#149 find after submit