#16 find after submit