Fixed offline mode support