fix and test

fix and test