bugfix: status handling and rescheduling