Remote pingpong fix