fixed spoofing issue with s2s prolly