Fix offline support