Fix bug with ServeRequest