Fixed clients not having a timeout