Removed inf-loop that messed up the server