Fixed regression in offline mode