add fix and tests