fixed all mess