Blackout bugfix