And check in the server, too