bug fix
clean warring