fixed support for offline setup