Addresses #29 again, again

Debugging on the server is a pain