fix some issues
test
12343