fixed bugы