fix #47 hope it doesn't take the server down