* Fixed bug JimShoe found