add test
some fix