bug fixup for offline mode