stabilized offline mode a little bit