Bugfix/schedule distinct