Don't set self.waiting twice