Slight fix, tests pass.