bug fix for offline enhancements