Fixed for offline