fix and test