bug fix
modify design