Slight fix and make tests pass.