* Fix framework singleton