#367 find after submit