Another fix and test