#394 find after submit