#379 find after submit