#58 find after submit