Should be fixed again. (More changes to protect against DoS attacks)