* Fixed bugs