Work around for server mismatch