* Fixed changes