Fixed Offline Mode Partially