Add fix and test