Bugfix for downtime