Cross-server working correctly