#245 find after submit