fixied bug