fixed all troubles