Fixing offline support