Made it actually work when the server hangs!