Bug fix, tighten test.