Fix offline handling