Issue #105: some compat code for servers that have not been updated