Hacky fix to get the client working with the 2.1.1 server