bugfix
test cases