fix bugs3