Bugfix rollover queue