Fix for third-party servers