restore singletone in version 2.0