fix the bugfix and the test.