Fixed RObin
Fixed check in Event Source