Fixes Offline Problem

Fixing Offline Problem