Fix "Client outdated" bug

Experimental fix, still needs more testing.