Small bugfix for offline-online transition