trying to fix Offline bug