Offline working fixed