Fix S2S sumbission feature again