Attempting to fix #1.

I think this is all that is needed, but I don't have the hardware for a server to test it.