make tests pass on 4.1