Fix offline-quite-slow