probably fixed s2s repeat bug