Fixed bom issue for offline mode