Maybe bugfix for scheduling bug