Fixed bug in Event computation