#186 find after submit