Fix an issue that broke the entire client