550,551c550
< if not self._ccObject.drain(drain_event):
< count = 1
---
> count += self._ccObject.drain(drain_event)
564c563
< if isinstance(self, SimObject) and not isinstance(self, ParamContext):
---
> if isinstance(self, System):